Add an option to forceably override user-scalable

Change-Id: I48e0fb0c3472ee51fc907f5b0d307a64400cfe36
4 files changed