Merge "Give Divider back its touch-region" into rvc-dev am: 5a61909275 am: 307e4aa1bd

Change-Id: Id03b2435ce88667b5c6c6bc9c6131ba61468e237