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

Change-Id: Ia996b90814514e35c2baee413ca47b695200bd3d