Merge "Fix gmail flicker issue in split screen" into tm-qpr-dev