Customisable location tile(2/2)

Change-Id: Id7a8a9522e8222ac990ebc13ae4b227c153d5ed1
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0