Merge "Limited AppCompat support" into lmp-dev