Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev am: 0bf55d7d28 am: e3f702e10c am: aa25b48303

Change-Id: Ib5092bc0fee11910b619fbd2b3c8d6ebfa4c2d29