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

Change-Id: I42334d65eeab08e9c72fa1001a69de7ac312a914