Merge "Change quick setting min_num_tiles number and text to resources value." into qt-dev am: bc058faaa3 am: 788232785d
am: e8acd24089

Change-Id: I9b310491e603bdf14b6e0acb7c703eece6a27579