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

Change-Id: Iec69e26358db4fc7219e9219d8f9f8b414730d0e