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

Change-Id: Ifd2c6539a59d1d82a6926b4d2cfd166143ad0bc9