Merge "Fix flickers when changing control" into rvc-dev am: c322ed21 am: 162040e3 am: b88c500f Change-Id: I35e41f4a49ae26f82b2c5e8a9b16d28b0d9ce822