Merge "Change quick setting min_num_tiles number and text to resources value." into qt-dev am: bc058faaa3 am: 0141ea3358
am: 8f85cabe1a

Change-Id: I57036e3881eecabe9f3c04cfd1341e6ca8805e0c