Merge "QSTileHost use overrideableByRestore" into rvc-dev am: cb9287697d am: a6ebd348cc am: bac13274bd

Change-Id: I61456850308a266cb6cc3348f84b5f655535dca9