Merge "Merge "Fix progressbar when orientation changes" into tm-qpr-dev am: e543602f" into tm-qpr-dev-plus-aosp