Merge "Fix action bar background drawing" into lmp-dev