Merge "Move from support appcompat to androidx appcompat"