Merge more changes from AOKP